Merge "resourceloader: Remove support for raw modules"

diff --combined includes/resourceloader/ResourceLoaderStartUpModule.php
index 2e7c869,64dfc94..2959b22
--- 1/includes/resourceloader/ResourceLoaderStartUpModule.php
--- 2/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@@ -254,10 -254,11 +254,11 @@@ class ResourceLoaderStartUpModule exten
                                continue;
                        }
  
-                       if ( $module->isRaw() ) {
-                               // Don't register "raw" modules (like 'startup') client-side because depending on them
-                               // is illegal anyway and would only lead to them being loaded a second time,
-                               // causing any state to be lost.
+                       if ( $module instanceof ResourceLoaderStartUpModule ) {
+                               // Don't register 'startup' to the client because loading it lazily or depending
+                               // on it doesn't make sense, because the startup module *is* the client.
+                               // Registering would be a waste of bandwidth and memory and risks somehow causing
+                               // it to load a second time.
  
                                // ATTENTION: Because of the line below, this is not going to cause infinite recursion.
                                // Think carefully before making changes to this code!
@@@ -341,13 -342,6 +342,6 @@@
                return $out;
        }
  
-       /**
-        * @return bool
-        */
-       public function isRaw() {
-               return true;
-       }
- 
        /**
         * @private For internal use by SpecialJavaScriptTest
         * @since 1.32
@@@ -401,7 -395,6 +395,7 @@@
  
                // Perform replacements for mediawiki.js
                $mwLoaderPairs = [
 +                      '$VARS.reqBase' => ResourceLoader::encodeJsonForScript( $context->getReqBase() ),
                        '$VARS.baseModules' => ResourceLoader::encodeJsonForScript( $this->getBaseModules() ),
                        '$VARS.maxQueryLength' => ResourceLoader::encodeJsonForScript(
                                $conf->get( 'ResourceLoaderMaxQueryLength' )

diff --combined resources/Resources.php
index 9c26986,20fc129..4446d0d
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -2150,10 -2150,7 +2150,10 @@@ return 
                ],
        ],
        'mediawiki.special.pageLanguage' => [
 -              'scripts' => 'resources/src/mediawiki.special.pageLanguage.js',
 +              'scripts' => [
 +                      'resources/src/mediawiki.special.mute.js',
 +                      'resources/src/mediawiki.special.pageLanguage.js'
 +              ],
                'dependencies' => [
                        'oojs-ui-core',
                ],
@@@ -2825,7 -2822,6 +2825,6 @@@
                'scripts' => [
                        'resources/lib/html5shiv/html5shiv.js'
                ],
-               'raw' => true,
        ],
  
        /* EasyDeflate */